bitkeeper revision 1.685 (400ed81cDUJ0NzxWWYhOS6J0LBNivg)

domain.c, dom0_ops.c, xc_linux_save.c:
  A few small fixes.

diff --git a/tools/xc/lib/xc_linux_save.c b/tools/xc/lib/xc_linux_save.c
index e5f5934cfff306fb976e5269c6f7021ac206260b..42ed198a710c62d77876ac0db61f908085370cd6 100644 (file)
--- a/tools/xc/lib/xc_linux_save.c
+++ b/tools/xc/lib/xc_linux_save.c
@@ -161,7 +161,12 @@ int xc_linux_save(int xc_handle,
 
         op.cmd = DOM0_STOPDOMAIN;
         op.u.stopdomain.domain = domid;
-        (void)do_dom0_op(xc_handle, &op);
+        if ( do_dom0_op(xc_handle, &op) != 0 )
+        {
+            we_stopped_it = 0;
+            PERROR("Stopping target domain failed");
+            goto out;
+        }
 
         sleep(1);
     }

diff --git a/xen/common/dom0_ops.c b/xen/common/dom0_ops.c
index d1659276c57c6de1486aa7f22afaf9a5200b25b3..d1a2983ea66bd4899689c39667e7149a6c59e9e9 100644 (file)
--- a/xen/common/dom0_ops.c
+++ b/xen/common/dom0_ops.c
@@ -354,6 +354,8 @@ long do_dom0_op(dom0_op_t *u_dom0_op)
 
         if ( likely(get_page(page, p)) )
         {
+            ret = 0;
+
             op.u.getpageframeinfo.type = NONE;
 
             if ( (page->type_and_flags & PGT_count_mask) != 0 )

diff --git a/xen/common/domain.c b/xen/common/domain.c
index 315539e507d292750d98243a76e27cf6341c66fa..8e3338f7b5d425259c6155ceadc631aead043319 100644 (file)
--- a/xen/common/domain.c
+++ b/xen/common/domain.c
@@ -205,6 +205,9 @@ long stop_other_domain(unsigned int dom)
     unsigned long cpu_mask;
     struct task_struct *p;
     
+    if ( dom == 0 )
+        return -EINVAL;
+
     p = find_domain_by_id (dom);
     if ( p == NULL) return -ESRCH;